Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 02:31:26 +0000 (18:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 02:31:26 +0000 (18:31 -0800)
commitc0b2e55fe85a22a7c0fb0822364289570c0292a7
tree9507f245ef672f49d12450210811614ca7ad7f86
parente7626dbe33299463c187eb07ad019216f0fc4023
parent14518570f857096a7c4856256e1798cedd92d4ce
Merge from trunk.